st: Adapt for ClutterContainer removal

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3014>

diff --git a/src/st/st-viewport.c b/src/st/st-viewport.c
index e6b912766b7e10ae2787c4b429e7139741b9a68c..f65c70c48c92892e976f9ed6fff3adbb90c5ed3e 100644 (file)
--- a/src/st/st-viewport.c
+++ b/src/st/st-viewport.c
@@ -283,10 +283,10 @@ st_viewport_allocate (ClutterActor           *actor,
   st_theme_node_get_content_box (theme_node, box, &viewport_box);
   clutter_actor_box_get_size (&viewport_box, &avail_width, &avail_height);
 
-  clutter_layout_manager_get_preferred_width (layout, CLUTTER_CONTAINER (actor),
+  clutter_layout_manager_get_preferred_width (layout, actor,
                                               avail_height,
                                               &min_width, &natural_width);
-  clutter_layout_manager_get_preferred_height (layout, CLUTTER_CONTAINER (actor),
+  clutter_layout_manager_get_preferred_height (layout, actor,
                                                MAX (avail_width, min_width),
                                                &min_height, &natural_height);
 
@@ -302,8 +302,7 @@ st_viewport_allocate (ClutterActor           *actor,
   if (priv->vadjustment)
     content_box.y2 += MAX (0, min_height - avail_height);
 
-  clutter_layout_manager_allocate (layout, CLUTTER_CONTAINER (actor),
-                                   &content_box);
+  clutter_layout_manager_allocate (layout, actor, &content_box);
 
   /* update adjustments for scrolling */
   if (priv->vadjustment)

diff --git a/src/st/st-widget.c b/src/st/st-widget.c
index 15c9d3ea1bd6b281afeb47e7d0fd41dae08a896f..de459e3af9b059ceaace6a2e59782ddf83880ad4 100644 (file)
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@@ -405,7 +405,7 @@ st_widget_allocate (ClutterActor          *actor,
   /* If we've chained up to here, we want to allocate the children using the
    * currently installed layout manager */
   clutter_layout_manager_allocate (clutter_actor_get_layout_manager (actor),
-                                   CLUTTER_CONTAINER (actor),
+                                   actor,
                                    &content_box);
 }